Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 4 Aug 2010 22:51:45 +0000 (22:51 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 4 Aug 2010 22:51:45 +0000 (22:51 +0000)

Trivial merge